Can't this condition be removed, since this line will now only be applied if there are `group_values` present?