Add Property.getValueOrDefault and use it where appropriate.