Redesign threads and forks according to the plan in issue #1730