Ok, based on the interdiff there, I'm happy with that last change. Markingas Ready For Committer.
Best,
David