Handle undefined macros better