Address more of the TODO items.