Improved number completion.