Move creation of list parameter to appropriate place

It couldn't work where it was as it didn't have an edition to look at.
This method is now returning three values, which is a smell. Going further
seems to involve a larger refactoring that I think ought to be done as
a follow-on from this branch.