Yet more tweaks to work around tmux issues.