Decouple local from global announcing (fixes #132)