Better handling of constructors.