Renamed property/get and property/set to getter and setter to avoid further ambiguity; tightened up content of watch