Fix (again) return values for toInt() and toShort().