Correct rendering service and living_street

Restore rendering highway=service in tunnels and highway=living_street in tunnels and on bridges.

This resolves a regression introduced in 34c72d848161e04a64d5a582d46066d56bc5e391.

This resolves #388.