Need to do these before merging (some may need no actions). - [x] Remove dependency for TCL - [ ] #4512 Use references for indexes of range-based for loops when this avoids expensive copies. - [ ] Use ArgParser