Evaluate triggerables for all repeat instances where needed

src/main/java/org/javarosa/core/model/FormDef.java

@@ -393,9 +393,6 @@ public void setValue(IAnswerData data, TreeReference ref, TreeElement node,
         boolean valueChanged = !objectEquals(answerDataSerializer.serializeAnswerData(oldValue),
             answerDataSerializer.serializeAnswerData(data));
 
-        if (midSurvey && dagImpl.shouldTrustPreviouslyCommittedAnswer() && !valueChanged) {
-            return;
-        }
         setAnswer(data, node);
 
         QuestionDef currentQuestion = findQuestionByRef(ref, this);
@@ -502,7 +499,7 @@ public FormIndex deleteRepeat(FormIndex index) {
             }
         }
 
-        dagImpl.deleteRepeatGroup(getMainInstance(), getEvaluationContext(), deleteRef, parentElement, deleteElement);
+        dagImpl.deleteRepeatInstance(getMainInstance(), getEvaluationContext(), deleteRef, deleteElement);
 
         return newIndex;
     }
@@ -523,7 +520,7 @@ public void createNewRepeat(FormIndex index) throws InvalidReferenceException {
         // Trigger actions nested in the new repeat
         getChild(index).getActionController().triggerActionsFromEvent(Action.EVENT_ODK_NEW_REPEAT, this, repeatContextRef, this);
 
-        dagImpl.createRepeatGroup(getMainInstance(), getEvaluationContext(), repeatContextRef, newNode);
+        dagImpl.createRepeatInstance(getMainInstance(), getEvaluationContext(), repeatContextRef, newNode);
     }
 
     @Override

src/main/java/org/javarosa/core/model/QuickTriggerable.java

@@ -37,10 +37,6 @@ boolean isRecalculate() {
         return triggerable instanceof Recalculate;
     }
 
-    TreeReference contextualizeContextRef(TreeReference anchorRef) {
-        return triggerable.contextualizeContextRef(anchorRef);
-    }
-
     public List<EvaluationResult> apply(FormInstance mainInstance, EvaluationContext ec, TreeReference qualified) {
         return triggerable.apply(mainInstance, ec, qualified);
     }

src/main/java/org/javarosa/core/model/condition/Triggerable.java

@@ -106,12 +106,6 @@ public Set<TreeReference> getTriggers() {
         return expr.getTriggers(originalContextRef);
     }
 
-    public TreeReference contextualizeContextRef(TreeReference anchorRef) {
-        // Contextualize the reference used by the triggerable against
-        // the anchor
-        return contextRef.contextualize(anchorRef);
-    }
-
     /**
      * Dispatches all of the evaluation
      */

src/main/java/org/javarosa/core/model/instance/TreeReference.java

@@ -321,10 +321,14 @@ public TreeReference contextualize(TreeReference contextRef) {
             }
 
             if (contextRef.getName(i).equals(newRef.getName(i))) {
-                if (newRef.getPredicate(i) == null) {
+                if (newRef.getPredicate(i) == null && contextRef.getPredicate(i) != null) {
+                    // Positive integer multiplicity is equivalent to a predicate with a position expression so a
+                    // reference level shouldn't have both. If there's an explicit predicate on either reference, always
+                    // favor that and clear out multiplicity on the contextualized node.
                     newRef.addPredicate(i, contextRef.getPredicate(i));
+                    newRef.setMultiplicity(i, INDEX_UNBOUND);
                 }
-                if (i + refLevel <= newRef.size()) {
+                if (newRef.getPredicate(i) == null && i + refLevel <= newRef.size()) {
                     newRef.setMultiplicity(i, contextRef.getMultiplicity(i));
                 }
             } else {