Minor improvements to the GP prototype parser.