Cleaned up CmdDictionary and CmdLexicographer