[NOMERGE] Minor priority request: Elaborate pandoc patches and CHDOC stuff