WP-3304: align affiliation fields.