Is this worth a: TODO: why does cf-runagent complicate that ?