Some refactoring of tree generator (getting rid of de-obfuscated names).