Minor formatting and const-specification changes.