#678 - improve handling of multiple constructors