With this change the no-arg ctor can go away too.