Code review comment for lp:~mbp/testscenarios/module-scenarios

On consideration, although those improvements would be useful, I think
we could land this and add them as enhancements when they're wanted -
maybe when we change bzr to use this.