Observe the test file before this patch:
I think this patch really improves on this case. The problem however, that some subexpressions of expressions should be tracked (like n in arr[n] here) is a broader one, and there may be other some cases I could add.