Make -filter and -not-filter do more simplification.