WP-3605: rearrange eva fields.