Better placement of calls to Thread#abort_on_exception
Minor variable name change.