Revert "Minor clean of the constructors"

@sroe do you spot in the original changes anything spurious?

This reverts merge request !419 (merged)