The migration to new language features has been far less painful than I thought it would be. I normally would not do this but what I am working on is in an early enough stage to take the gamble as "losing" won't have too high a price tag.
It's so nice to eliminate lines of code while moving forward.