Improved performance around the number map.