* replace all uses of TryGetContainerContainer with non-obsolete overload * rerun
Also includes some (non critical) changes to the solution file to re-organize the Roslyn components.