I think I've figured out why I didn't stumble on this method before..

After redefining the macros, I discovered the code I'm wrapping is taking the "return early, return often" concept to the extreme by way of exits.

Oh well, back to the drawing board!

Thanks again :)