minor generator speedup