Fix lots of NumericValue issues - probably more to go.