I wonder if we could get away with a lot smaller diff if we "from __future__ import unicode_literals" and let the quote marks continue as " for the time being?