Sorry, my previous patch misses a lots of cases to correctly match a
shortcut.  This new one fixes it.