Partial testing and fixes of composite-field type.