Since we weaved the latter into the former, we can now get rid of
the transition code.  The behaviour doesn't change.