Nodes now correctly calculate the delivery delay.  This includes using the shorter timeout required when |nodes| == 2