Simplify and avoid signal-handling races.