Flesh out const correctness.