Reformat TODO entry for clarity
Shift a probably-impossible TODO out into a code comment
Remove a TODO; Diggle's made aliases easier to use, that's sufficient for the time being