Cleaning up the Creator interface and Generator.