The formal for expandForLoop has been converted from CallExpr to the parent ForLoop; propagate this to the helpers used by expandForLoop