Renaming units->values
More strict type unification for values having type signatures