<graphic> in <surface> should be treated like any other
make handling of empty heads and singleton divs more sophisticated.

A head with any children, and an empty div with div children, both
deserve to live