Tidy up the parser actions