diff --git a/PSReadLine/KeyBindings.cs b/PSReadLine/KeyBindings.cs
index b59449e..ce73a10 100644
--- a/PSReadLine/KeyBindings.cs
+++ b/PSReadLine/KeyBindings.cs
@@ -267,77 +267,77 @@ namespace Microsoft.PowerShell
         {
             _dispatchTable = new Dictionary<PSKeyInfo, KeyHandler>
             {
-                { Keys.Backspace,       MakeKeyHandler(BackwardDeleteChar,   "BackwardDeleteChar") },
-                { Keys.Enter,           MakeKeyHandler(AcceptLine,           "AcceptLine") },
-                { Keys.ShiftEnter,      MakeKeyHandler(AddLine,              "AddLine") },
-                { Keys.LeftArrow,       MakeKeyHandler(BackwardChar,         "BackwardChar") },
-                { Keys.RightArrow,      MakeKeyHandler(ForwardChar,          "ForwardChar") },
-                { Keys.ShiftLeftArrow,  MakeKeyHandler(SelectBackwardChar,   "SelectBackwardChar") },
-                { Keys.ShiftRightArrow, MakeKeyHandler(SelectForwardChar,    "SelectForwardChar") },
-                { Keys.UpArrow,         MakeKeyHandler(PreviousHistory,      "PreviousHistory") },
-                { Keys.DownArrow,       MakeKeyHandler(NextHistory,          "NextHistory") },
-                { Keys.AltLess,         MakeKeyHandler(BeginningOfHistory,   "BeginningOfHistory") },
-                { Keys.AltGreater,      MakeKeyHandler(EndOfHistory,         "EndOfHistory") },
-                { Keys.Home,            MakeKeyHandler(BeginningOfLine,      "BeginningOfLine") },
-                { Keys.End,             MakeKeyHandler(EndOfLine,            "EndOfLine") },
-                { Keys.ShiftHome,       MakeKeyHandler(SelectBackwardsLine,  "SelectBackwardsLine") },
-                { Keys.ShiftEnd,        MakeKeyHandler(SelectLine,           "SelectLine") },
-                { Keys.Escape,          MakeKeyHandler(Chord,                "ChordFirstKey") },
-                { Keys.Delete,          MakeKeyHandler(DeleteChar,           "DeleteChar") },
-                { Keys.Tab,             MakeKeyHandler(Complete,             "Complete") },
-                { Keys.CtrlA,           MakeKeyHandler(BeginningOfLine,      "BeginningOfLine") },
-                { Keys.CtrlB,           MakeKeyHandler(BackwardChar,         "BackwardChar") },
-                { Keys.CtrlC,           MakeKeyHandler(CopyOrCancelLine,     "CopyOrCancelLine") },
-                { Keys.CtrlD,           MakeKeyHandler(DeleteCharOrExit,     "DeleteCharOrExit") },
-                { Keys.CtrlE,           MakeKeyHandler(EndOfLine,            "EndOfLine") },
-                { Keys.CtrlF,           MakeKeyHandler(ForwardChar,          "ForwardChar") },
-                { Keys.CtrlG,           MakeKeyHandler(Abort,                "Abort") },
-                { Keys.CtrlL,           MakeKeyHandler(ClearScreen,          "ClearScreen") },
-                { Keys.CtrlK,           MakeKeyHandler(KillLine,             "KillLine") },
-                { Keys.CtrlM,           MakeKeyHandler(ValidateAndAcceptLine,"ValidateAndAcceptLine") },
-                { Keys.CtrlN,           MakeKeyHandler(NextHistory,          "NextHistory") },
-                { Keys.CtrlO,           MakeKeyHandler(AcceptAndGetNext,     "AcceptAndGetNext") },
-                { Keys.CtrlP,           MakeKeyHandler(PreviousHistory,      "PreviousHistory") },
-                { Keys.CtrlR,           MakeKeyHandler(ReverseSearchHistory, "ReverseSearchHistory") },
-                { Keys.CtrlS,           MakeKeyHandler(ForwardSearchHistory, "ForwardSearchHistory") },
-                { Keys.CtrlT,           MakeKeyHandler(SwapCharacters,       "SwapCharacters") },
-                { Keys.CtrlU,           MakeKeyHandler(BackwardKillInput,    "BackwardKillInput") },
-                { Keys.CtrlX,           MakeKeyHandler(Chord,                "ChordFirstKey") },
-                { Keys.CtrlW,           MakeKeyHandler(UnixWordRubout,       "UnixWordRubout") },
-                { Keys.CtrlY,           MakeKeyHandler(Yank,                 "Yank") },
-                { Keys.CtrlAt,          MakeKeyHandler(SetMark,              "SetMark") },
-                { Keys.CtrlBackspace,   MakeKeyHandler(BackwardDeleteChar,   "BackwardDeleteChar") },
-                { Keys.CtrlUnderbar,    MakeKeyHandler(Undo,                 "Undo") },
-                { Keys.CtrlRBracket,    MakeKeyHandler(CharacterSearch,      "CharacterSearch") },
-                { Keys.CtrlAltRBracket, MakeKeyHandler(CharacterSearchBackward,"CharacterSearchBackward") },
-                { Keys.Alt0,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt1,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt2,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt3,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt4,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt5,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt6,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt7,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt8,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.Alt9,            MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.AltMinus,        MakeKeyHandler(DigitArgument,        "DigitArgument") },
-                { Keys.AltB,            MakeKeyHandler(BackwardWord,         "BackwardWord") },
-                { Keys.AltShiftB,       MakeKeyHandler(SelectBackwardWord,   "SelectBackwardWord") },
-                { Keys.AltD,            MakeKeyHandler(KillWord,             "KillWord") },
-                { Keys.AltF,            MakeKeyHandler(ForwardWord,          "ForwardWord") },
-                { Keys.AltShiftF,       MakeKeyHandler(SelectForwardWord,    "SelectForwardWord") },
-                { Keys.AltR,            MakeKeyHandler(RevertLine,           "RevertLine") },
-                { Keys.AltY,            MakeKeyHandler(YankPop,              "YankPop") },
-                { Keys.AltBackspace,    MakeKeyHandler(BackwardKillWord,     "BackwardKillWord") },
-                { Keys.AltEquals,       MakeKeyHandler(PossibleCompletions,  "PossibleCompletions") },
-                { Keys.CtrlAltQuestion, MakeKeyHandler(ShowKeyBindings,      "ShowKeyBindings") },
-                { Keys.AltQuestion,     MakeKeyHandler(WhatIsKey,            "WhatIsKey") },
-                { Keys.AltPeriod,       MakeKeyHandler(YankLastArg,          "YankLastArg") },
-                { Keys.AltUnderbar,     MakeKeyHandler(YankLastArg,          "YankLastArg") },
-                { Keys.CtrlAltY,        MakeKeyHandler(YankNthArg,           "YankNthArg") },
-                { Keys.AltA,            MakeKeyHandler(SelectCommandArgument,"SelectCommandArgument") },
-                { Keys.AltH,            MakeKeyHandler(ShowParameterHelp,    "ShowParameterHelp") },
-                { Keys.F1,              MakeKeyHandler(ShowCommandHelp,      "ShowCommandHelp") },
+                { Keys.Backspace,              MakeKeyHandler(BackwardDeleteChar,        "BackwardDeleteChar") },
+                { Keys.Enter,                  MakeKeyHandler(AcceptLine,                "AcceptLine") },
+                { Keys.ShiftEnter,             MakeKeyHandler(AddLine,                   "AddLine") },
+                { Keys.LeftArrow,              MakeKeyHandler(BackwardChar,              "BackwardChar") },
+                { Keys.RightArrow,             MakeKeyHandler(ForwardChar,               "ForwardChar") },
+                { Keys.ShiftLeftArrow,         MakeKeyHandler(SelectBackwardChar,        "SelectBackwardChar") },
+                { Keys.ShiftRightArrow,        MakeKeyHandler(SelectForwardChar,         "SelectForwardChar") },
+                { Keys.UpArrow,                MakeKeyHandler(PreviousHistory,           "PreviousHistory") },
+                { Keys.DownArrow,              MakeKeyHandler(NextHistory,               "NextHistory") },
+                { Keys.AltLess,                MakeKeyHandler(BeginningOfHistory,        "BeginningOfHistory") },
+                { Keys.AltGreater,             MakeKeyHandler(EndOfHistory,              "EndOfHistory") },
+                { Keys.Home,                   MakeKeyHandler(BeginningOfLine,           "BeginningOfLine") },
+                { Keys.End,                    MakeKeyHandler(EndOfLine,                 "EndOfLine") },
+                { Keys.ShiftHome,              MakeKeyHandler(SelectBackwardsLine,       "SelectBackwardsLine") },
+                { Keys.ShiftEnd,               MakeKeyHandler(SelectLine,                "SelectLine") },
+                { Keys.Escape,                 MakeKeyHandler(Chord,                     "ChordFirstKey") },
+                { Keys.Delete,                 MakeKeyHandler(DeleteChar,                "DeleteChar") },
+                { Keys.Tab,                    MakeKeyHandler(Complete,                  "Complete") },
+                { Keys.CtrlA,                  MakeKeyHandler(BeginningOfLine,           "BeginningOfLine") },
+                { Keys.CtrlB,                  MakeKeyHandler(BackwardChar,              "BackwardChar") },
+                { Keys.CtrlC,                  MakeKeyHandler(CopyOrCancelLine,          "CopyOrCancelLine") },
+                { Keys.CtrlD,                  MakeKeyHandler(DeleteCharOrExit,          "DeleteCharOrExit") },
+                { Keys.CtrlE,                  MakeKeyHandler(EndOfLine,                 "EndOfLine") },
+                { Keys.CtrlF,                  MakeKeyHandler(ForwardChar,               "ForwardChar") },
+                { Keys.CtrlG,                  MakeKeyHandler(Abort,                     "Abort") },
+                { Keys.CtrlL,                  MakeKeyHandler(ClearScreen,               "ClearScreen") },
+                { Keys.CtrlK,                  MakeKeyHandler(KillLine,                  "KillLine") },
+                { Keys.CtrlM,                  MakeKeyHandler(ValidateAndAcceptLine,     "ValidateAndAcceptLine") },
+                { Keys.CtrlN,                  MakeKeyHandler(NextHistory,               "NextHistory") },
+                { Keys.CtrlO,                  MakeKeyHandler(AcceptAndGetNext,          "AcceptAndGetNext") },
+                { Keys.CtrlP,                  MakeKeyHandler(PreviousHistory,           "PreviousHistory") },
+                { Keys.CtrlR,                  MakeKeyHandler(ReverseSearchHistory,      "ReverseSearchHistory") },
+                { Keys.CtrlS,                  MakeKeyHandler(ForwardSearchHistory,      "ForwardSearchHistory") },
+                { Keys.CtrlT,                  MakeKeyHandler(SwapCharacters,            "SwapCharacters") },
+                { Keys.CtrlU,                  MakeKeyHandler(BackwardKillInput,         "BackwardKillInput") },
+                { Keys.CtrlX,                  MakeKeyHandler(Chord,                     "ChordFirstKey") },
+                { Keys.CtrlW,                  MakeKeyHandler(UnixWordRubout,            "UnixWordRubout") },
+                { Keys.CtrlY,                  MakeKeyHandler(Yank,                      "Yank") },
+                { Keys.CtrlAt,                 MakeKeyHandler(SetMark,                   "SetMark") },
+                { Keys.CtrlBackspace,          MakeKeyHandler(BackwardDeleteChar,        "BackwardDeleteChar") },
+                { Keys.CtrlUnderbar,           MakeKeyHandler(Undo,                      "Undo") },
+                { Keys.CtrlRBracket,           MakeKeyHandler(CharacterSearch,           "CharacterSearch") },
+                { Keys.CtrlAltRBracket,        MakeKeyHandler(CharacterSearchBackward,   "CharacterSearchBackward") },
+                { Keys.Alt0,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt1,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt2,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt3,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt4,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt5,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt6,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt7,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt8,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.Alt9,                   MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.AltMinus,               MakeKeyHandler(DigitArgument,             "DigitArgument") },
+                { Keys.AltB,                   MakeKeyHandler(BackwardWord,              "BackwardWord") },
+                { Keys.AltShiftB,              MakeKeyHandler(SelectBackwardWord,        "SelectBackwardWord") },
+                { Keys.AltD,                   MakeKeyHandler(KillWord,                  "KillWord") },
+                { Keys.AltF,                   MakeKeyHandler(ForwardWord,               "ForwardWord") },
+                { Keys.AltShiftF,              MakeKeyHandler(SelectForwardWord,         "SelectForwardWord") },
+                { Keys.AltR,                   MakeKeyHandler(RevertLine,                "RevertLine") },
+                { Keys.AltY,                   MakeKeyHandler(YankPop,                   "YankPop") },
+                { Keys.AltBackspace,           MakeKeyHandler(BackwardKillWord,          "BackwardKillWord") },
+                { Keys.AltEquals,              MakeKeyHandler(PossibleCompletions,       "PossibleCompletions") },
+                { Keys.CtrlAltQuestion,        MakeKeyHandler(ShowKeyBindings,           "ShowKeyBindings") },
+                { Keys.AltQuestion,            MakeKeyHandler(WhatIsKey,                 "WhatIsKey") },
+                { Keys.AltPeriod,              MakeKeyHandler(YankLastArg,               "YankLastArg") },
+                { Keys.AltUnderbar,            MakeKeyHandler(YankLastArg,               "YankLastArg") },
+                { Keys.CtrlAltY,               MakeKeyHandler(YankNthArg,                "YankNthArg") },
+                { Keys.AltA,                   MakeKeyHandler(SelectCommandArgument,     "SelectCommandArgument") },
+                { Keys.AltH,                   MakeKeyHandler(ShowParameterHelp,         "ShowParameterHelp") },
+                { Keys.F1,                     MakeKeyHandler(ShowCommandHelp,           "ShowCommandHelp") },
             };
 
             // Some bindings are not available on certain platforms