Merge "Minor dumpstate refactorings:"