Tweaking #watch so that it returns the value of the block