Updates to conform with the new type_of macros. Update to type_of macros to pass in NT as the dummy type rather than Component_Type.