Use new constructor syntax.
Fix constructor overload workarounds.