Work around limitation in rule merging.
Some cleanup on dynamic semantics
work around some limitations in unification