Finish almost-completed TODO.