Const-correctness please (and everywhere else in this file).