Improvements to generators.