Exception work clean up.

Change-Id: Ide71ba25ea70b39651f80d9ff469019898a929e6
diff --git a/src/thread.cc b/src/thread.cc
index 92b3d4f..69fb3ba 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -312,11 +312,8 @@
   pLdivmod = __aeabi_ldivmod;
   pLmul = __aeabi_lmul;
   pInvokeInterfaceTrampoline = art_invoke_interface_trampoline;
-  pDeliverException = art_deliver_exception;
 #endif
-#if defined(__i386__)
   pDeliverException = art_deliver_exception;
-#endif
   pF2l = F2L;
   pD2l = D2L;
   pAllocFromCode = Array::AllocFromCode;
@@ -1304,8 +1301,8 @@
   if (catch_finder.native_method_count_ == 1) {
     PopSirt();
   } else {
-    // We only expect the stack crawl to have passed 1 native method as its terminated
-    // by a up call
+    // We only expect the stack crawl to have passed 1 native method as it's terminated
+    // by an up call
     DCHECK_EQ(catch_finder.native_method_count_, 0u);
   }
   long_jump_context->SetSP(reinterpret_cast<intptr_t>(catch_finder.handler_frame_.GetSP()));