Clean and clarify a few minor things
Add a MAP_LIST macro, which inserts commas