Finish 3744

This finishes the great pull request started by @mickaelandrieu in #3744.
Have you tested this code? I believe shortcuts which are longer than 1 character will break things like `-brbz`