Rearrange a bit and add in a few old shortcuts.