Builder internal class constructor rewrite issue [Workaround]

[builder-main]

Current Workaround

Thanks to new c# syntax rewrites nicely as type can be omited.

public class Ghost{
        public Ghost MyBuilderFunc()
        {
            return new /*Remove Class name*/(/*params*/);
        }
}

Issue

public class Ghost{
        public Ghost MyBuilderFunc()
        {
            return new Ghost(/*params*/);
        }
}

rewrites to and fail as class mismatch

public class Ghost__Patched{
        public Ghost__Patched MyBuilderFunc()
        {
            return new Ghost(/*params*/);
        }
}