Good idea. (Actually I still have the (Short.MaxValue.toInt - 1) test. Look about 15 lines up)