Fix issues relating to shorts: literals, and the fact that "short + short" has type int (yes, really!). Also fix cast from primitive to different boxed (e.g. int to Short).