Remove some duplication between exit/item field handling