Merge: Cleanup auto_super_init