A few more tweaks for changes in sisyphus and t7 repos; thanks real@ for both fixing and tracking things.
