With missing "separate commit", I am having a hard time to decide if
this is something I should pick up at this moment, or I should wait
until that separate commit materializes. What is your intention?
I send a serious including this patch the next days.
If there are more review comments, they are welcome.