Actions watcher redux

Make sure Actions queued before a watcher starts are picked up when the watcher does start.

Also slight refactoring to prepare for Actions being queued on Services as well as Units