Poor Zach indeed, but I figured Noah being Noah, he would have asked the Haitian to wipe his mind a second time before the Haitian and Claire left Odessa, just to be absolutely sure the Company wouldn't be able to use Zach against Claire.

And yes, the dynamic is. That phonecall was my favourite scene in the episode.