Switch to correctly-sized integer types.