Get the watch functions out of the way

This way they don't collide with the parser hack and you can still poke
at them