Empty leaves without names  no longer hangs the json parser
Removed outdeffed stuff and a left '#if 1'