Push the refactor through UnzipArrays/doE, but still need to finish one piece