Improved handling of number-like entity names.