This fixes #7700.  It now returns the types of averages.