The three subject PRs collude to make scripts fail in -p4 with a lock-related errors.  These come from the synthetic probe begin {} emitted for initializing probe conditional expressions/flags, that looks empty and elision-worthy.  But if not elided after all, due to a typo, it made references to the stp_probe_locks structure.