Make consistent use of the correct debug macros across the file.