A little bit more cleanup in the parser