No changes, this is just a pure refactoring to facilitate the upcoming change which won't have to be done in all these ctors any more.