Cleanup super() calls for python3