Special rendering for intermittent waterways - fixes #805