More const correctness and numeric restraints.