Fixed: exclude property accessors from matching, to avoid duplicates