Supports expand_args='by_run'. Needs testing