Bit of cleanup in parser.