Some TODO note tweaks.