Alternate 1602 implementation

I wasn't a fan of the fix in 1602, so I worked up an alternate implementation that doesn't involve two conditionals per filter. WDYT @myronmarston ?