Stripping out CompositeGenerator to clean it up without borking the current commits.