OutputModel: Reduce complexity re. pre-filtering

Less extendable now, but it's also questionable if we ever need to extend
it.

Addresses Milian's concerns.