Refine the segue classes. A couple more pushes like this are likely.