general: cleanup in tunneling code
tunnel: Starting to remove special cases.