@jheretic, any thoughts on including the commotion debug macros in commotion.h?