Minor changes to make the parser a bit saner etc