more alteration of wire_defs to make auto-generation easier