Restore previously non-deprecated constructor variants