refactor arm pattern references and variant ident subspans