[Truffle] Tidy up the yield dispatch nodes a bit.