Partial fixes for Parser.