(PAC-)Learning state machines from data streams: A generic strategy and an improved heuristic (Extended version)