Cleaner way to handle the replacement of watch links (#8071).
Authored by: jplang 2011-04-05
Parent: [r5319]
Child: [r5321]