Now that thread-local error data is handled in error, move the thread local data out of the `threadstate` object, since it has now become useless indirection.
