Ran Resharper code cleanup.

All 119u tests pass.