More runs.scm refactoring