clarify logic for resolving property parents
fix performance regression caused by 2eb3c46 (#784)