WIP
Further simplification ideas
Further refactoring
Continue refactoring
Begin rewriting parser hooks using new storage class
More parser functions work
Remove old code superseded by refactored version
Parser functions
Continue work on parser functions
...