Merge in parser adjustment so that = now belongs to the actual parser.