No more copy-in-constructor logic