Clean up declarations in parser.y.