Render building passages as tunnels (correction)

Building passages are now correctly rendered as tunnels.
This fix makes sure that such tunnels are not being hidden by the
non-tunnel rendering, which was rendered in addition to the tunnel
rendering.

This is a correction of #444.

This is a rebase of #548.