Fixes a bug when select_list is present in related_key_dict_passthrough but
group_by_list is not.
Also, reduce the number of code paths.