Fix up ctor.