fixup! Isolate MacrosCompat for 2.10 and 2.11