That sounds fine - I'm definitely keen not to lose units where necessary. 

For interest this code was originally inserted as a temporary fix to handle units not present in udunits. I was given the impression at the time that an alternative method of handling units was being developed...