So +1 to the PR?

I also started stacking functions so we can conceivably handle expression rendering differently if it occurs in a function call. Technically the HQL parser already does some of this, but there might be criteria-specific cases where we want to handle these differently as well.

For now, we could choose to just remove that aspect of the PR and just track clauses