Rename watch property and watch/unwatch functions.

This fixes problems on Firefox due to Object.property.watch and unwatch.