For a direct branch without merge, we lost control dependent expressions.
This CL updates the three depdencies and updates the tests to handle the new validation errors which are produced.