Yet another series of parser fixes