state/multiwatcher: move remaining mutliwatcher related types

Followup to #1108 

It's pretty clear that these other types belong to the multiwatcher.