More changes to the logic of Column Summaries from previous commits

The changes today (last 2 commits) to the column summaries ended up
fixing some case but breaking others. There is now custom/alternate
logic only for the special 'having' condition case (which needs the
subselect wrapping). See in-code comments for more details