Fix some shift-sign-overflow

[r-barnes]

The project currently does not compile with -Wshift-sign-overflow.

This fixes that, or at least some of it. This will shortly be required for achieving internal compilation.