Issue #27: got rid of some unnecessary debug-related macros