Enhance syntax for WITHIN and for nested expressions.