Some more Parser fixes.