Convert test expression into less imposing form.
rejoin the branch
A bit more tidiness expressing the new test expression.