Fix DocumentCommandHandlers test failure and the issue of not reporting multiple bindings to the same command after saving key map file. Also some minor changes for review feedback.