Added and and or expressions, and syntax-expansion for them