Hmm, I don't see this old code in these patches. Resend 0002-* because of trailing spaces.
AFAIK, cfbot does not seek old versions of patchset parts in previous messages. So for it to run correctly, a new version of the whole patchset should be sent even if most patches are unchanged.