Hello, I'd like to extend the partial patch to PR64432, which still lacks treatment of some minor corner cases. I'd appreciate if somebody would lend me a hand with some hints, either through the PR or by mail. Thanks, Harald