Swap the order of a few things, for consistency.