diff -ur cvs-slony1/tools/altperl/slonik_drop_set.pl slony1/tools/altperl/slonik_drop_set.pl
--- cvs-slony1/tools/altperl/slonik_drop_set.pl	2009-08-17 20:25:50.000000000 +0300
+++ slony1/tools/altperl/slonik_drop_set.pl	2010-01-04 13:28:45.000000000 +0200
@@ -41,14 +41,8 @@
 require $CONFIG_FILE;
 
 my ($set) = @ARGV;
-if ($set =~ /^(?:set)?(\d+)$/) {
-  $set = $1;
-} else {
-  print "Need set identifier\n";
-  die $USAGE;
-}
-
-get_set($set) or die "Non-existent set specified.\n";
+die $USAGE unless $set;
+$set = get_set($set) or die "Non-existent set specified.\n";
 
 my $slonik = '';
 
diff -ur cvs-slony1/tools/altperl/slonik_execute_script.pl slony1/tools/altperl/slonik_execute_script.pl
--- cvs-slony1/tools/altperl/slonik_execute_script.pl	2009-08-17 20:25:50.000000000 +0300
+++ slony1/tools/altperl/slonik_execute_script.pl	2010-01-04 13:30:15.000000000 +0200
@@ -54,14 +54,8 @@
 require $CONFIG_FILE;
 
 my ($set, $file) = @ARGV;
-if ($set =~ /^(?:set)?(\d+)$/) {
-  $set = $1;
-} else {
-  print "Invalid set identifier\n\n";
-  die $USAGE;
-}
-
-get_set($set) or die "Non-existent set specified.\n";
+die $USAGE unless $set;
+$set = get_set($set) or die "Non-existent set specified.\n";
 $node = $SET_ORIGIN unless $node;
 
 # We can either have -c SCRIPT or a filename as an argument.  The
diff -ur cvs-slony1/tools/altperl/slonik_merge_sets.pl slony1/tools/altperl/slonik_merge_sets.pl
--- cvs-slony1/tools/altperl/slonik_merge_sets.pl	2009-08-17 20:25:50.000000000 +0300
+++ slony1/tools/altperl/slonik_merge_sets.pl	2010-01-04 13:42:33.000000000 +0200
@@ -38,19 +38,10 @@
   die $USAGE;
 }
 
-if ($set1 =~ /^(?:set)?(\d+)$/) {
-  $set1 = $1;
-} else {
-  print "Valid set names are set1, set2, ...\n\n";
-  die $USAGE;
-}
-
-if ($set2 =~ /^(?:set)?(\d+)$/) {
-  $set2 = $1;
-} else {
-  print "Valid set names are set1, set2, ...\n\n";
-  die $USAGE;
-}
+die $USAGE unless $set1;
+$set1 = get_set($set1) or die "Non-existent set specified.\n";
+die $USAGE unless $set2;
+$set2 = get_set($set2) or die "Non-existent set specified.\n";
 
 my ($dbname, $dbhost) = ($DBNAME[$MASTERNODE], $HOST[$MASTERNODE]);
 
diff -ur cvs-slony1/tools/altperl/slonik_move_set.pl slony1/tools/altperl/slonik_move_set.pl
--- cvs-slony1/tools/altperl/slonik_move_set.pl	2009-10-21 16:32:08.000000000 +0300
+++ slony1/tools/altperl/slonik_move_set.pl	2010-01-04 13:42:53.000000000 +0200
@@ -29,13 +29,9 @@
 require $CONFIG_FILE;
 
 my ($set, $node1, $node2) = @ARGV;
-if ($set =~ /^(?:set)?(\d+)$/) {
-  # Node name is in proper form
-  $set = $1;
-} else {
-  print "Valid set names are set1, set2, ...\n\n";
-  die $USAGE;
-}
+
+die $USAGE unless $set;
+$set = get_set($set) or die "Non-existent set specified.\n";
 
 if ($node1 =~ /^(?:node)?(\d+)$/) {
   $node1 = $1;
diff -ur cvs-slony1/tools/altperl/slonik_subscribe_set.pl slony1/tools/altperl/slonik_subscribe_set.pl
--- cvs-slony1/tools/altperl/slonik_subscribe_set.pl	2009-08-17 20:25:50.000000000 +0300
+++ slony1/tools/altperl/slonik_subscribe_set.pl	2010-01-04 13:41:04.000000000 +0200
@@ -36,14 +36,8 @@
   die $USAGE;
 }
 
-if ($set =~ /^(?:set)?(\d+)$/) {
-  $set = $1;
-} else {
-  print "Need to specify set!\n";
-  die $USAGE;
-}
-
-get_set($set) or die "Non-existent set specified.\n";
+die $USAGE unless $set;
+$set = get_set($set) or die "Non-existent set specified.\n";
 
 my $slonik = '';
 
diff -ur cvs-slony1/tools/altperl/slonik_unsubscribe_set.pl slony1/tools/altperl/slonik_unsubscribe_set.pl
--- cvs-slony1/tools/altperl/slonik_unsubscribe_set.pl	2009-08-17 20:25:50.000000000 +0300
+++ slony1/tools/altperl/slonik_unsubscribe_set.pl	2010-01-04 13:43:06.000000000 +0200
@@ -36,12 +36,8 @@
   die $USAGE;
 }
 
-if ($set =~ /^(?:set)?(\d+)$/) {
-  $set = $1;
-} else {
-  print "Need to specify set!\n\n";
-  die $USAGE;
-}
+die $USAGE unless $set;
+$set = get_set($set) or die "Non-existent set specified.\n";
 
 my $slonik = '';
 $slonik .= genheader();