WP-4682: add wrappers to fields.