Removed some code generation

Undid some of the over-zealous code duplication elimination now that I'm
in a different mood