Minor improvement in the codegeneration