After restructuring signal handling to avoid race conditions.