Minor rephrasing; add some TODOs.