WINTERMUTE: Struct'ify addWatch