Shifted tracing from macros2 into macros, changing all the unit tests in macros2 to utilize the `require` macro and finding/fixing several bugs in the process