Looks like that Swift did the job. The little Partition might be ugly, but it works.

Now with even more aplomb