This fixes 73c646a3. I misread the #ifdefs and didn't realise that they were in the middle of passing parameters to a function. Move the workaround outside this.