All sorts of sundry changes, from reading other folks' dotfiles.