Water: Fix model slowness with latest AgentScript