Reworking threads to be more explicit.