Add some binary expressions and minor improvements.