Minor code clean up in parser.