@lcdhoffman patch looks good - only thing I've noticed is that we're getting duplicate note_index_item_type entries when we import at-tracer.xml.  I think that's because of the mapping above?  Should the values map to the enumeration values?