Cleans the handling of partitioning up.  More or less the same story as with
other drivers...