You are right Matej Novotny it does appear to be CFW at fault. I had forgotten our discussion on the PR from 3 weeks ago and had mixed up the outstanding issues; I should have double-checked that. I'll see if I can get a clean run using the updated CFW and we'll go from there.