I would recommend replacing macros with constexpr to allow type checking.