Make type enum values have the same names as Scala types
macro generator code cleanup
cleanup treehugger code a bit