Issue #2274795 by Wim Leers | chx: Simplify (and defuse) the filter skipping code.