Fix a bunch of clang warnings.

- Using struct consistently for ExpressionBase.
- Correct guard name.