I think the "neither can take another piece following the swap" is to restrictive. After the swap it is not your turn anymore anyway and it would basically make it impossible to swap with a queen or rook/bishop. They can capture something for most parts of the game. Just usually a protected piece.