Update in accordance with latest version of A::P::Engine (build_watcher_guard)