Upgraded constraint solver - can handle binary expressions where both left and right side are identifiers