Add a style test for new grammar and convert all current instances of old grammar. The new grammar is optional in 2.5 < Python < 3.0 and the new normal in Python 3. Now that we have dropped Py2.5 support, this change will reduce the number of conversions made by 2to3.