Code cleanup with ReSharper 8.1.