Remove uses of 'short' and 'long'