Replaced address flag checks with macros