More codegen cleanup.