Minor clean up of AvailabilityMetric and Scanner