my bad, i overlooked the changes to the constructor, indeed that looks good.

Still, do we want that feature?