Cleaned up the code generation a lot.