pandoc.hs:  More code reorganization.