re-format wire_def to make it easier to auto-generate