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