More improvements to the -x option (some from Matt & some from me).