Fix calls to super.

Using super(self.__class__, self) is wrong. Need to use super(name,
self).

Change-Id: I927862c8aa908e55bc1b20835662f219ee8e8021