Add missing onunmatches and _super calls.