I used a setupHook instead of patching expressions for individual reverse dependencies (four were broken).