[Pods] Small cleanup and a TODO.