Move adding watches into a separate function and be table-driven. (dm)
Move adding watches into a separate function and be table-driven. (dm)

brltty/brltty,brltty/brltty,brltty/brltty,brltty/brltty,brltty/brltty,brltty/brltty