Small refactoring of graphviz_draw.
The only observable effect should be that calling with output=None and (output_format="xlib" or fork=True) no longer causes an AttributeError.
The only observable effect should be that calling with output=None and (output_format="xlib" or fork=True) no longer causes an AttributeError.