More obvious "placeholder" labels in dummy tree.
Improve handling of unts. Clobber more old code.