minor

ExpressionPredicate:
- make some purely functional methods static
- make nested types static