Refactored second pass into transfos and IterativeMatcher