fix new add-hoc datastream support so it is stored per-object instead of per-class