Minor tweak to dealing with contiguous runs of partitions.

- Hard code 10 repeated attempts to get rid of contiguous partitions.
- Added a TODO to do something perfect at some unspecified time in the future...