Make use of [wrapping_]byte_{add,sub}
#100819
+17
−18
Merged