Changing the way averages (everything) works.

@maxfliri
@gtrogers