Annotate variable name including index

[jprotze]

to account for width of the variable access

This alignes the annotation to annotations in other codes