First stage of full parser/handler infrastructure refactoring.