Consistently assign x first in our swap macros.