Fixed the macros for making trees from strings easily.