Lovely!
Edit: Just found that the swap item exists in the Edit menu, and with the shortcut key displayed. Not sure how I could miss that one, but yesterday I could only find it in the edit pane context menu.
Sorry to take up your time with this nonsense. I'll shape up...