Some more fixes to the parser.