Fix control order, keyboard shortcut, and descriptions after the arguments were separated in a85d3a5f.