Idempotent-flow, resolved hacks.