Correct a couple of bugs introduced by previous void-safe changes. Ensure that specialised archetypes with constrained code lists work properly. See openEHR/adl-archetypes recent additions - test archetypes in the adl-archetypes\ADL15-reference\validity\ontology group - openEHR-EHR-EVALUATION.VDTV_code_list_constrained.v1.adls, openEHR-EHR-EVALUATION.code_list_constrained.v1.adls, openEHR-EHR-EVALUATION.code_list_parent.v1.adls.