Some more TODOs and correctness on ResponseGenerators.