Rearranged preprocessor statements containing version checks such that these