Avoid using short integer types unnecessarily