Made some ReSharper changes.