Adaptions for changes in ArrayIdentifier and LoopNode