Cope with CTE now returning only parts of group rather than object.