Multiple changes:

Simplify argument block
Moved the graph generation to its own sub
Print instead of warn if dump is requested