make v2 syntax better readable
a field type may contain commas now
field annotations may contain commas
remove unused macro
clean macros up