Some additional TODO comments.