I am not usually a fan of macros either for exactly the reason that my code probably now needs a bit of rewrite.
I do like the simple "Fast" macros because their intent is clear and they are easy to use. I know how to do Port instructions. I have written a lot of assembly for other processors.
I might just look at the macros and see why they broke.
Given the popularity of MightyCore, I assume I am not the first to encounter this issue and perhaps someone has an improved set of compatible macros or can tell me what I am missing.