In another change we may want to also restore if the original value was
xsd:double or xsd:decimal

This is similar to our previous treatment of xsd:integer vs xsd:float
and allows us to filter on decimals and doubles while retrieving them
with the correct type information instead of just treating them as
aliases for xsd:float

NOTE: This requires an index rebuild!

Also addresses a few other nitpicks from the review