More output_structure.cpp repairs.