Change parser ordering around to avoid ints and decimals being swallowed.