Fixed up the bits of the parser completed so far.