GCC 4.6.1 fixes

So Fedodra 15 has GCC 4.6.1 and required the following "fixes". Actually one is probably not good and I forgot about it until I was writing this note. This would be the place where I comment out the variable "i" that appears inside an if (0){} conditional. Certainly that code was added to shut-up some other gcc warning/error so just removing it may not have been the wisest of choices -- though in my case I certainly got no other error after I rid the code of it, so perhaps the work-around it originally implemented is no longer required(?)