Cleaning up the partitioning logic a little in preparation for shrinking the hash pool a little bit.  May speed things up a bit or not.