Would you mind including this in the TODO?  I might forget it in a week, and which PR this TODO was associated with.  :)