Removed dependency on global state from Dump*() functions