Inline parser functions for counter and period
Consolidate generateFactorParser()
Improved parse override syntax
Simplify queryDictionary parsing