Add classes to type env and refactor debugging code
Wrap nested elements in syntax objects for uniformity