Unify probe data structure.  Untested.