Get rid of old-style object subclassing
Use Python3-style super function