Code factorisation for yielders

We should certainly define what do we want to use. For now we have a lot of warning from compiler because we mismatch class/struct use everywhere.