Better numeric checking for #815 on number / currency fields