Handle as_string in _validated rather than in _format_num
Merge branch 'refactor-number' into dev