Fix TODO messaging.