Minor refactor and fix naming for Parser::Parse.