The main intent is cleanup using C# 6 operators and normalization of
type aliases. While there are no intended functional changes here, it
does eliminate a few tight race conditions as a bonus (not a real-win
since this isn't thread-safe all over, simply noting).
Nick Craver
Ryan Nowak
Pranav K
Hisham Abdullah Bin Ateya
N. Taylor Mullen
Chris Ross