Const correctness and simple changes.