Reformat, add defbitfield.