diff --git a/R/column_functions.R b/R/column_functions.R
index 559c55d5..a0e5432f 100644
--- a/R/column_functions.R
+++ b/R/column_functions.R
@@ -12,7 +12,8 @@
 #' @export
 #'
 get_dataset_prefixed_col_names <- function(data) {
-  if (!is.null(attr(data, "filter_and_columns", exact = TRUE)$columns) && all(attr(data, "filter_and_columns", exact = TRUE)$columns != "")) {
+  columns <- attr(data, "filter_and_columns", exact = TRUE)
+  if (!is.null(columns) && all(columns != "")) {
     paste(attr(data, "dataname"), attr(data, "filter_and_columns")$columns, sep = ".")
   } else {
     NULL
diff --git a/R/get_merge_call.R b/R/get_merge_call.R
index b319299b..5646f37a 100644
--- a/R/get_merge_call.R
+++ b/R/get_merge_call.R
@@ -383,16 +383,14 @@ get_anl_relabel_call <- function(columns_source, datasets, anl_name = "ANL") {
         column_labels <- labels[intersect(colnames(data_used()), column_names)]
 
         # NULL for no labels at all, character(0) for no labels for a given columns
-        return(
-          if (rlang::is_empty(column_labels)) {
-            column_labels
-          } else {
-            stats::setNames(
-              column_labels,
-              selector[names(column_labels)]
-            )
-          }
-        )
+        if (rlang::is_empty(column_labels)) {
+          column_labels
+        } else {
+          stats::setNames(
+            column_labels,
+            selector[names(column_labels)]
+          )
+        }
       }
     )
   )