Replace overly-cute coding with code that (a) has defined behavior

according to the ANSI C spec, (b) gets the boundary conditions right,
and (c) is about a third as long and three times more intelligible.