Further code cleanup in numformats.rb