Refactor instructions. Direct style, remove references to generator until it gets properly rewritten