Make no-dh work, plus other no-dh problems found by Richard.