Sounds good.  I'll fix this in stages.  I've already added the new constructor.  Next (after this is merged) I'll update the places that use this code to use the new constructors.  Then I'll eliminate the old constructors and this function.