Swap order/slight cleanup in _xon-start-explicit