More fixes for from_number.