Rename a field from 'mfa' to 'mfargs' to avoid confusion
Rewrite a clause with disjunction to multiple clauses