cleanup via subpatchers, key+shift now triggers secondary dominant