Some more Py2 porting. Apparently, it doesn't like empty classes.