Change __super__ calls