Gary, actually, it is only one concern with this PR. But we can live without `return this` fix for these simple builders. It was a point to keep in mind for our future with SI Java DSL.
All other comments are OK and can be fixed on merge.

So, your conclusion: are going to play with generics or let's leave as is and go ahead?
BTW, Pr should be rebased: isn't mergeable now