Various xinitrc improvements.