Make setting and removing deep fields work properly.