Make use of the new conditional compilation stuff