Moving location of swap() to be more appropriate.
Authored by: nerius 2023-10-17
Parent: [r1309]
Child: [r1311]