Remove the magic binding state flag and replace with function.

The function that adds a binding to the tracked set is now
conditionally replaced with a no-op in the case where we are not
in a binding tracking state.