Switch to using this.__super__ instead of explicitly named references