Fixed bug where, under c89 mode, callback macros wouldn't work