Code review comment for lp:~james-w/tarmac/break-up-do-merges

Please create bugs for the issues, include tests, and split the changes into a branch or two which do not have unnecessary dependencies on other unrelated changes.