Simplify examples

Now that it's possible to group by an expression, some examples
can be simplified.