Some parser bugfixes.