Another optimization. Bringing us closer to generic support for cliques