Updated TODO with Jens' comments.