Cleanup: const correctness.