Thanks for the replies (also those off-list)! Based on these "recommendations", I've submitted PR 39094, actually. If it's considered useful, I can send the patch files to the list as well, of course. Let me know if there's anything else I should do - or if something is missing. Kaspar