Adjust visitor to allow sums/conditionals of expressions of arbitrary shape

The visitor state regarding indices needs to be correctly reset
for child iteration in these cases.