Thread body revisited

Revisit how we handle thread body for consistency and flexibility.