Improve const correctness.