Address more Rob feedback in make_node_role()