Merge "Split dumpstate's execution into shorter functions"