Re-order a few things to reduce some underfull lines in dvi output.