Merge "Actually make Parser::pstPass2() private"