Minor tidy-up to AutoMeasurement.