More places where I had to switch to Python 3-style division