added missing macro tags to must_be_flag calls