Address some TODO markers.