removing accidental redefinition of 'retain until' macros