Initial changes for ReSharper 8.2 support.