Aggregate counts up to structure nodes.  Bugfixes.
Merge remote-tracking branch 'origin/r2' into r2
Catch empty VersionState assignment.  Summaries test as class.