moved unit-of-measure variable indices into annotations
split multiple-variable declarations when different units are inferred