Add: a few minor improvements/fixings to the parser.