Fix check for lists/tuples. Refs #6955
Merge branch 'bugfix/6955_indirect_c2e_diag' into develop