Improve marcdump format and change Main to use it.