Also reordered assignment of fields in parse_rest_of_def, just to be OCD.