Added syntactic simplifier