generate slightly more "const-correct" code