Expose string_of_number and little bit of cleanup.