"combine-ifying" all generator code, untested support for global vdecls
more TODO documentation
merged with ruchir