Use more macros

Familiarity++
jabberd2 policy