The right way forward is probably to move the logic of https://github.com/open-city/dedupe/pull/132/files#L6R128 up to here.