Partial conversion to Thor.