Update infractions to use newer system used by upstreams rewrite