Fix use of "const const" caught by clang