Clean up InstructionGenerator and implement a proper assert.