Fixed debug macro.
Use a name for the debug method which doesn't clash with the debug macro (doh).
Merge branch 'debug-callback'