diff --git a/manifests/proxy/domain_remap.pp b/manifests/proxy/domain_remap.pp
index 7f0956b5..933e5adc 100644
--- a/manifests/proxy/domain_remap.pp
+++ b/manifests/proxy/domain_remap.pp
@@ -82,11 +82,7 @@ class swift::proxy::domain_remap(
 
   include swift::deps
 
-  if !is_service_default($reseller_prefixes) and is_array($reseller_prefixes) {
-    $reseller_prefixes_str = join($reseller_prefixes, ',')
-  } else {
-    $reseller_prefixes_str = $reseller_prefixes
-  }
+  $reseller_prefixes_real = join(any2array($reseller_prefixes), ',')
 
   swift_proxy_config {
     'filter:domain_remap/use':                      value => 'egg:swift#domain_remap';
@@ -97,7 +93,7 @@ class swift::proxy::domain_remap(
     'filter:domain_remap/set log_address':          value => $log_address;
     'filter:domain_remap/storage_domain' :          value => $storage_domain;
     'filter:domain_remap/path_root':                value => $path_root;
-    'filter:domain_remap/reseller_prefixes':        value => $reseller_prefixes_str;
+    'filter:domain_remap/reseller_prefixes':        value => $reseller_prefixes_real;
     'filter:domain_remap/default_reseller_prefix':  value => $default_reseller_prefix;
     'filter:domain_remap/mangle_client_paths':      value => $mangle_client_paths;
   }
diff --git a/manifests/storage/server.pp b/manifests/storage/server.pp
index 8bf0fd7e..11c8e271 100644
--- a/manifests/storage/server.pp
+++ b/manifests/storage/server.pp
@@ -226,11 +226,8 @@ define swift::storage::server(
   }
 
   # Warn if ${type-server} isn't included in the pipeline
-  if is_array($pipeline) {
-    if !member($pipeline, "${type}-server") {
-      warning("swift storage server ${type} must specify ${type}-server")
-    }
-  } elsif $pipeline != "${type}-server" {
+  $pipeline_array = any2array($pipeline)
+  if !member($pipeline_array, "${type}-server") {
     warning("swift storage server ${type} must specify ${type}-server")
   }