Exactly.
Hell, I have even stated that if this tunnel were to be replaced with an 8 lane structure, I would be more than happy if it were done to include 2 commercial / truck only lanes + 2 Bus / HOV only lanes (allowing a rapid bus) and therefore still only having 4 general purpose lanes (which exist today).
Along with bike / pedestrian infrastructure. I am not demanding an increase in SOV capacity, but a structure that properly encourages car pooling, allows for a rapid Bus system, and streamlines the flow of goods.