Use saturating arithmetic functions more

[bbarker]

e.g. https://doc.rust-lang.org/std/primitive.i32.html#method.saturating_add
This will obviate the need for clamp in most places, I think