Most of the work was resurrecting old code and renaming loop variables
to clarify what was actually being done. Refs #22286.