Some cleanup in preparation for bigger changes to the item editing concept...