upgrades analyzer, uses schedule to simplify set

... of passes

- tries to eliminate macro expansion
- filters empty matches