Move optional watcher resolution to a subroutine