Various parser fixes.