[c2392] Also add some const correctness