Some code cleanup preparing to support single-node vs. multi-node results (since we need to support current node, single (other) node, and all nodes).