Housekeeping: reorganize format fields, simplify the building tasks.