Replaced most calls to parent classes by super.