Simplified overall and per-type partition counting.  Code is reduce,
and now only one call is required to report and track a new partition.