Added support for leading numerals, as we have 8DotXXX and 6DotXXX style uniqueIds in our dataset.  Revealed by the updated tests for CTR-98.