Added WithPropertyResolution / WithoutPropertyResolution and ToStrategy.