diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
index 4b1bd5e5..10baf3cf 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Common.pm
@@ -12,19 +12,18 @@ sub worker_body {
   my $self = shift;
   my $wid = $self->wid;
 
+  my $tag  = $self->worker_tag;
   my $type = $self->worker_type;
-  my $name = $self->worker_name;
 
   while (1) {
-      debug "$type ($wid): asking for a job";
-      my $jobs = $self->jq_take($self->wid, $name);
+      my $jobs = $self->jq_take($self->wid, $type);
 
       foreach my $job (@$jobs) {
           my $target = $self->munge_action($job->action);
 
           try {
               $job->started(scalar localtime);
-              info sprintf "$type (%s): starting %s job(%s) at %s",
+              info sprintf "$tag (%s): starting %s job(%s) at %s",
                 $wid, $target, $job->id, $job->started;
               my ($status, $log) = $self->$target($job);
               $job->status($status);
@@ -38,18 +37,15 @@ sub worker_body {
 
           $self->close_job($job);
       }
-
-      debug "$type ($wid): sleeping now...";
-      sleep(1);
   }
 }
 
 sub close_job {
   my ($self, $job) = @_;
-  my $type = $self->worker_type;
+  my $tag = $self->worker_tag;
   my $now = scalar localtime;
 
-  info sprintf "$type (%s): wrapping up %s job(%s) - status %s at %s",
+  info sprintf "$tag (%s): wrapping up %s job(%s) - status %s at %s",
     $self->wid, $job->action, $job->id, $job->status, $now;
 
   try {
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm
index f0b13ec4..1ae2aa2c 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive.pm
@@ -10,8 +10,8 @@ with 'App::Netdisco::Daemon::Worker::Common';
 with 'App::Netdisco::Daemon::Worker::Interactive::DeviceActions',
      'App::Netdisco::Daemon::Worker::Interactive::PortActions';
 
-sub worker_type { 'int' }
-sub worker_name { 'Interactive' }
+sub worker_tag  { 'int' }
+sub worker_type { 'Interactive' }
 sub munge_action { 'set_' . $_[1] }
 
 1;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm
index 34559016..1350ba4e 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Poller.pm
@@ -13,8 +13,8 @@ with 'App::Netdisco::Daemon::Worker::Poller::Device',
      'App::Netdisco::Daemon::Worker::Poller::Nbtstat',
      'App::Netdisco::Daemon::Worker::Poller::Expiry';
 
-sub worker_type { 'pol' }
-sub worker_name { 'Poller' }
+sub worker_tag  { 'pol' }
+sub worker_type { 'Poller' }
 sub munge_action { $_[1] }
 
 1;
diff --git a/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm b/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
index 4a146fa5..f8f81a69 100644
--- a/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
+++ b/Netdisco/lib/App/Netdisco/JobQueue/PostgreSQL.pm
@@ -102,7 +102,16 @@ sub jq_userlog {
 # PostgreSQL engine depends on LocalQueue, which is accessed synchronously via
 # the main daemon process. This is only used by daemon workers which can use
 # MCE ->do() method.
-sub jq_take { (shift)->do('take_jobs', @_) }
+sub jq_take {
+  my ($self, $wid, $type) = @_;
+
+  # be polite to SQLite database (that is, local CPU)
+  debug "$type ($wid): sleeping now...";
+  sleep(1);
+
+  debug "$type ($wid): asking for a job";
+  $self->do('take_jobs', $wid, $type);
+}
 
 sub jq_lock {
   my $job = shift;