Representing Water Scarcity in Future Agricultural Assessments