minor Swift reorg