Refactoring a la ReSharper, plus corrections in an XML documentation comment