Septillion,
If this works check the following images. The first is from 1.6.13 and the second is from 1.8.0. Both a shots of the same piece of code. Do you see any differences? Maybe it's me but the 1.6.13 is clearer especially the the #define ENABLED (look at the A). Also look at the W in SWITCHING.
1.6.13
1.8.0
Well, that didn't work as expected. Open the link to see the image. Time to learn how to embed an image.