Expression queries shouldn't consume non-linear types.
Avoid name capture in CP macro expansion.