Make the getType() methods final
Remove the conversion between -1 and MAX_SHORT, in favour of doing it CB-side