WIP
Further simplification ideas
Further refactoring
Continue refactoring
Begin rewriting parser hooks using new storage class