Minor refactoring
Makes sure debug macros are only available in Debug environment