Clean up parser.
Clean up parser.

Again, hopefully this has not broken anything, and indeed the small
amount of testing done suggests it hasn't, but this is not thoroughly
tested.

septract/starling-tool,septract/starling-tool