Move Unit parsing to System.Web.R7