Cleanup: some const-correctness.