Making the short-list of the TODO nicer.
Authored by: debug 2019-05-21
Parent: [r6181]
Child: [r6183]
