Updates to SourceBuilder to handle multiple constructors