Refactor|Partitioner: Continued remodeling work...