Always output an inheritance-aware version of the xxxx_Check() macro. Also

fixed that macro to actually work:-)