Richard Sandiford wrote:

> OK with those changes.  Thanks for putting so much effort into this.

OK, the patch has been committed with the suggested tweaks.

-Sandra