This looks good now... I tested assigning a new number last night, and did not find any rogue numbers < 10 digits long.