Replaced BinaryExp with more general pattern