CLN/BUG: tag locals with their creating instance id