Merge conflicts

Hi folks,

I’ve merged some of the PRs. I’ve got a tangle of merge conflicts in PR
202. Mike, you’ve got some in PR 222.

It looks ugly enough in 202 that I’m not going to try to slog my way
through it tonight. I’ll take another look tomorrow morning.

                                        Be seeing you,
                                          norm

--
Norm Tovey-Walsh
Saxonica