Minor cleanup when going through TODOs.