Better parsing of numeric values