Fix array access calls not being wrapped