Fix incr / decr behaviours with singleton watchers. Fix #42