Get rid of the whole "Node2" business, rename getNode() ->getBlock() to