Various improvements, including winery marker workarounds, unsealed dashes again.