Feedback from nim review, and comments noting changes which will need to be made
on ddp-pre1.

Will be squashed into previous commit when merged to devel.