Allow block to be optionally passed to Generator constructor.
Finish a7p7.