Add macros to eliminate warnings without debug