Remove remaining assumptions about fall-through edges and ordering.