Tidied conditional compilation stuff