Make preprocessor logic more fail-safe.