Add a few "const" where they make sense.