Concerning #598: Temporarily reverted CodeGenerator class to unbreak trunk