modernize a bunch of watchfiles