After each fixup, check that there are no empty strings in content lists. They disrupt some fixups; fixing the few places where we were inserting empty strings fixed some formatting bugs.