More hacks in the parser