Merge to fix last commit message; plus identification of
potential problem for the dihedral type code.