Don't bridge if WSAT context is already added
Paul's tidy ups for gytis