He he... :)

Yes, after merging PR #286 the problem will disappear. However, if you keep the #if/#endif there, you will probably get a merge conflict at the end (although an easy one, I guess).