Simplify swap macro