fix related to refactoring of watcher
fix related to refactoring of watcher

sagemathinc/smc,tscholl2/smc,tscholl2/smc,DrXyzzy/smc,tscholl2/smc,DrXyzzy/smc,DrXyzzy/smc,DrXyzzy/smc,tscholl2/smc,sagemathinc/smc,sagemathinc/smc,sagemathinc/smc,tscholl2/smc