[Delivers #83960292] Cleanup deprecated invokesuper code.