Close #1858, as I think the points have been well resolved.
[Squashed commits to make git blame etc. more likely to work. -ED]