Less trickery for generators