Added rendering of waterway labels.