Last commit before bedtime...

Fixed some segmentation faults in common cases with last commit.
Move away from driver_match'ing for everything... which especially doesn't make sense
now that we have relational data between connect and disconnect callback.