Continued refactoring a la ReSharper.