Improved code generation slightly.