Cleanup from renaming directives.