Yep. In hindsight, I think I'd like to remove that method on the criteria object. No need to have the two-way dep between client and criteria. Commit incoming!