Discard somewhat too extreme optimizations

The methods of Generator are going to be further divided, so there’s no
need for such a fine-grained forced scope control for variables.
Improve comments