Misc refactoring of run launch loop(s). No bugs fixed