Enforced more const correctness.