[PATCH 4/4] Fix a couple incorrect usages of the super() function.