WIP - rename NewParseContext -> ParseContext