Make style more consistent and const-correct.