Updates #31 by being more selective when attributing variables to a MetricUnit