Move a couple more global-set-keys to the related function definitions.