Fix a few lexical or preprocessor issues.