Separators: handle T configurations correctly.

The algorithm could be simpler, but it works.