A little bit of cleanup from generator stuff