Various improvements to performance via bind-once on watchers