Replace active watchers with statics.

Closed the previous PR due to a messed up local copy. 

This shouldn't have any merge conflicts and adheres to the latest feedback given.