Remove hacky #define's to call delegate methods.