Opening this task along with others as I do a cleanup pass, just to remember what would deserve more attention at some point.
Note :
No trivial task as this will require to manage impact on related tools, but a necessary task for the sake of better human-readability of this table.