[MS][00000000] Refactor to remove side effects of calling super.