Cleanup through ReSharper 8.