I hope this cleanup both addresses the above questions and tidies things up as indicated. Please ask if you've got more questions.
BTW, please add a merged changelog entry to ChangeLog.tm-merge. No need for a ChangeLog.tm, unless we don't merge, in case we're back to ChangeLog.tm for a complete history :(.
Thanks for doing this Richard H.