Added associativity rules and, and deep expression substitution