Refactor|Partitioner: Minor cleanup refactorings