Incremental commit: attempt to fix the watching code after the xenstore client merge