Get rid of some fuzzy macros as it makes syntax tools getting mad

src/ejabberd_c2s.erl

@@ -173,14 +173,14 @@
 %% XEP-0198:
 
 -define(IS_STREAM_MGMT_TAG(Name),
-	Name == <<"enable">>;
+	(Name == <<"enable">>) or
-	Name == <<"resume">>;
+	(Name == <<"resume">>) or
-	Name == <<"a">>;
+	(Name == <<"a">>) or
-	Name == <<"r">>).
+	(Name == <<"r">>)).
 
 -define(IS_SUPPORTED_MGMT_XMLNS(Xmlns),
-	Xmlns == ?NS_STREAM_MGMT_2;
+	(Xmlns == ?NS_STREAM_MGMT_2) or
-	Xmlns == ?NS_STREAM_MGMT_3).
+	(Xmlns == ?NS_STREAM_MGMT_3)).
 
 -define(MGMT_FAILED(Condition, Xmlns),
 	#xmlel{name = <<"failed">>,

src/mod_muc_admin.erl

@@ -876,27 +876,25 @@ set_room_affiliation(Name, Service, JID, AffiliationString) ->
 	    error
     end.
 
--define(MAKE_CONFIG_OPT(Opt), {Opt, Config#config.Opt}).
-
 make_opts(StateData) ->
     Config = StateData#state.config,
     [
-     ?MAKE_CONFIG_OPT(title),
+     {title, Config#config.title},
-     ?MAKE_CONFIG_OPT(allow_change_subj),
+     {allow_change_subj, Config#config.allow_change_subj},
-     ?MAKE_CONFIG_OPT(allow_query_users),
+     {allow_query_users, Config#config.allow_query_users},
-     ?MAKE_CONFIG_OPT(allow_private_messages),
+     {allow_private_messages, Config#config.allow_private_messages},
-     ?MAKE_CONFIG_OPT(public),
+     {public, Config#config.public},
-     ?MAKE_CONFIG_OPT(public_list),
+     {public_list, Config#config.public_list},
-     ?MAKE_CONFIG_OPT(persistent),
+     {persistent, Config#config.persistent},
-     ?MAKE_CONFIG_OPT(moderated),
+     {moderated, Config#config.moderated},
-     ?MAKE_CONFIG_OPT(members_by_default),
+     {members_by_default, Config#config.members_by_default},
-     ?MAKE_CONFIG_OPT(members_only),
+     {members_only, Config#config.members_only},
-     ?MAKE_CONFIG_OPT(allow_user_invites),
+     {allow_user_invites, Config#config.allow_user_invites},
-     ?MAKE_CONFIG_OPT(password_protected),
+     {password_protected, Config#config.password_protected},
-     ?MAKE_CONFIG_OPT(password),
+     {password, Config#config.password},
-     ?MAKE_CONFIG_OPT(anonymous),
+     {anonymous, Config#config.anonymous},
-     ?MAKE_CONFIG_OPT(logging),
+     {logging, Config#config.logging},
-     ?MAKE_CONFIG_OPT(max_users),
+     {max_users, Config#config.max_users},
      {affiliations, ?DICT:to_list(StateData#state.affiliations)},
      {subject, StateData#state.subject},
      {subject_author, StateData#state.subject_author}