From Craig Silverstein: better organization for TLS code.