Improved const-correctness