Various parser bug-fixes.