First steps at rationalising list parameter passing
Cleanup of list parameter handling