Pretty much cleaned up

 * Symbols are now compared with symbols, not strings.
 * Several for-loops are substituted with map
 * CNF cond cases are simplified
 * No more namespaces are generated for tree substitution
 * A couple of (-> ...) were replaced when it did not make any sense