const-correctness additions