tmux: Rearrange and add a couple tweaks.