review and respond to comments on PR #381

[masinter]

see comments in #381

[rmkaplan]

I take it that you have merged what was there, and that I should now take you comments into account in a subbranch of the merged master, to get to a clean state?

[masinter]

Whatever ths was, it's been handled