Changed handling of extended statistics.