Filter class definitions per statement

[madig]

This hopefully fixes the chaos that happens if you filter class defs first and then your sub statement was relying on the original order and checked for glyph presence itself.