Subclass FixRaise from 2to3

Reuse 2to3 code to reduce separate maintenance.

I also fixed an unrelated test that was causing local test failures on Python 3 - it wasn't showing up in Travis because two problems in the test cancelled each other out.