Bringing back the keepallorigs, mustmatchorigs and paranoia options