Improve GenerateCLIDocsTable