Refactored out ParserContext abstraction.