WIP: More progress on GeneratorSimpleImpl