Expand comments in TODO.