[PATCH 2/2] Yet more TODO list updates.