More cosmetic changes and a TODO item.