Noting functionality which really ought to have been factored out into external-monitor-job but could not be