Cleanups, modernized API usage in CategoryNode,CategoryDump,BaseDump