Move TODO to a more visible place.