First steps on refactoring runs.scm calls with lots of params