Tidy up with_property and with_property_value scope code