Do a proper is_type comparison for ints.
Sort and extend the unit info dictionary.