Fixed the check for which property changed in _notify. Removed unused static function...