rename propertyValueAsOr=>refValueAsOr and more API-adapt