Shrinkwrap cluster borders

Previously we did not treat cluster border nodes special in horizontal
positioning. This would sometimes lead to the border nodes being drawn
away from the nodes the cluster contained. This change ensures that we
keep the border nodes tight with the contained cluster nodes.