I shouldn't have, I started this work on an older existing branch that I rebased -- hence that problem and the swap files. Will revert in the next PR.