Thank you for your patience.
I hope this is what you are looking for.
Yes, that's exactly it. However, I had to rewrite the commit message because it would say "I hope this is what you are looking for." :-)
I fixed it (and squashed the other patch with this one) so your patch would look good in the series.