Little clean-up in parser