Get rid of the need to specify the nodename.