MINOR: Change some TODO comments