Python 3.3 fixups.