Allow unit measurement to be optional in unit-re