BF: Fix misplaced ";", and duplicate {ip,}matches
Merge pull request #620 from kwirk/xarf-tweaks

BF: Fix misplaced ";", and duplicate {ip,}matches