Extract ForceApprovalMatcher and tidy up