Minor tweaks and corrections for reusing PartitionCountingCallbacks