Reordering macros so we can use when-not in set!.