Further code review from the end of #2730
Merge pull request #2866 from lgray/pfcluster_rebuild_morecodereview

Reco -- Further code review from the end of #2730