Fix intersections once and for all

Removed the last of the excess intersections while sticking to Jake's
tertiary preferences. ;)