smaller type in an initializer. Adjust various places accordingly. Avoid set-but-not-used warnings in some other places for newer GCC.
