Towards const correctness