Swap to better format macro

This'll make it easier to not forget to switch back to format! when it
gets updated.