fix dusty debugging macros
6 files changed