Update for ifdef for clang. Also fix a bad operation comparison.