replace shorts with ints along the lines of SCL git d2baec0, but be more judicious in using unsigned versus signed