Waterway, pengelak dan diversion to tunnel