Some cleanups
While working on rebasing Zeenix signal-broadcast code, I fixed a TODO in tests, and cherry-picked an obvious commit that can go now imho.
While working on rebasing Zeenix signal-broadcast code, I fixed a TODO in tests, and cherry-picked an obvious commit that can go now imho.