debug macros didn't get the refactor from the previous checkin