Cosmetics: s/short/int16_t/