Minor imporvements to arch_matches()