Move some macros back to the only functions calling them.

Also propagate some signedness guarantees all around.
Propagate some signedness.