Small codegen cleanup