Removed support for uint and ushort to follow principle of least surprise