cleanup and pre-prep for #6810#8503

dsyme merged 1 commit intodotnet:masterdotnet/fsharp:masterfrom

dsyme:c6dsyme/fsharp:c6Copy head branch name to clipboard