Proxy tidy up and extra asserts.

Ensure we don't suspend when placing object args into IRT.
Ensure stack is sane.

Change-Id: I20a8c97002b74878831580da1dd03458363ece82
diff --git a/src/thread.cc b/src/thread.cc
index f7c568f..fbd6a88 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -2064,8 +2064,8 @@
   // Visit roots on this thread's stack
   Context* context = GetLongJumpContext();
   RootCallbackVisitor visitorToCallback(visitor, arg);
-  ReferenceMapVisitor<RootCallbackVisitor> mapper(GetManagedStack(), GetInstrumentationStack(), context,
-                                                  visitorToCallback);
+  ReferenceMapVisitor<RootCallbackVisitor> mapper(GetManagedStack(), GetInstrumentationStack(),
+                                                  context, visitorToCallback);
   mapper.WalkStack();
   ReleaseLongJumpContext(context);
 }
@@ -2079,8 +2079,8 @@
 void Thread::VerifyStack() {
   UniquePtr<Context> context(Context::Create());
   RootCallbackVisitor visitorToCallback(VerifyObject, Runtime::Current()->GetHeap());
-  ReferenceMapVisitor<RootCallbackVisitor> mapper(GetManagedStack(), GetInstrumentationStack(), context.get(),
-                                                  visitorToCallback);
+  ReferenceMapVisitor<RootCallbackVisitor> mapper(GetManagedStack(), GetInstrumentationStack(),
+                                                  context.get(), visitorToCallback);
   mapper.WalkStack();
 }
 #endif