parser -> _PARSER, minor code reorg