AverageByComponent small improvements. Refs #2710