Consistently use 'watchdir' instead of 'watch_dir' now.