Add HAVING support.