#KJ-41 Fixed. Extract elaboration of 'Invoke and elab of arrays into separate modules.