Combined constraints and introduced value randomizer.
diff --git a/skeletons/constr_CHOICE_oer.c b/skeletons/constr_CHOICE_oer.c
index b975fd1..ed8c761 100644
--- a/skeletons/constr_CHOICE_oer.c
+++ b/skeletons/constr_CHOICE_oer.c
@@ -244,7 +244,7 @@
         }
 
         rval = elm->type->op->oer_decoder(opt_codec_ctx, elm->type,
-                                          elm->oer_constraints, memb_ptr2, ptr,
+                                          elm->encoding_constraints.oer_constraints, memb_ptr2, ptr,
                                           size);
         rval.consumed += consumed_myself;
         switch(rval.code) {
@@ -353,7 +353,7 @@
         ASN__ENCODE_FAILED;
     }
 
-    er = elm->type->op->oer_encoder(elm->type, elm->oer_constraints, memb_ptr,
+    er = elm->type->op->oer_encoder(elm->type, elm->encoding_constraints.oer_constraints, memb_ptr,
                                     cb, app_key);
     if(er.encoded > 0)
         er.encoded += tag_len;