Completed ReSharper refactoring; only a couple of trivial items remaining