Add some TODO comments for considering what happens in the new edge cases that might now show up, since the Executor introduces failure modes that the code did not have before.