Made ast_parse_rest_of_def follow conventions of other parsing functions.
Reordered fields in ast_def, making generics go first.