Start refactoring cleanup + add match negation.