Fix up some warnings.
Drop pre-made generators.
Optimize generators even better.