Reformat decls and add convenience constructors.