Fix explicit de-init macros