Finish some conversions - appears to work on 2.6, 2.7, and 3!