tighten up parsing of numbers (#1579)