Cleanup handling of bind-once delegates after #9825

As noted in #9825 / ed99821, we are doing some weird things, and now treating certain expressions as "stateful" in a way that doesn't really make sense.

Watch delegates shouldn't be stateful unless they absolutely need to be (IE depend on a stateful filter) --- and we shouldn't be performing the bind-once behaviour unless we're actually trying to bind-once.
