Corrected inheritance macros