Actually *return* the ShortType. Fixes 6b0b92e.