Removed uses of C# 6 language features for compatibility with Azure build servers.