Transformations: Use SubstituteExpression to apply range normalisation

This prevents updated delcarations being appended to the end of the spec.

loki/transformations/array_indexing.py

@@ -169,7 +169,8 @@ def is_one_index(dim):
             new_shape = [d.upper if is_one_index(d) else d for d in v.shape]
             new_type = v.type.clone(shape=as_tuple(new_shape))
             vmap[v] = v.clone(dimensions=as_tuple(new_dims), type=new_type)
-    routine.variables = [vmap.get(v, v) for v in routine.variables]
+    routine.spec = SubstituteExpressions(vmap).visit(routine.spec)
+    routine.body = SubstituteExpressions(vmap).visit(routine.body)
 
 
 def promote_variables(routine, variable_names, pos, index=None, size=None):