Rearrange debugging macros