Cleaned up debug macros.