MADS: Further cleanup of previously anonymous fields