b0694f6170
underscore. This is the preferred form. Also fix a preprocessor syntax error in an error-detection section.