Make preprocessor condition more specific and useful by changing