Add non-null getters for leaf objects