TODO list: Eliminate what's accomplished in previous commit.