Service cleanups...

runtime/observatory/lib/src/elements/context_view.html

Index: runtime/observatory/lib/src/elements/context_view.html
diff --git a/runtime/observatory/lib/src/elements/context_view.html b/runtime/observatory/lib/src/elements/context_view.html
index bf618150a1c79c7651aa220b98a08bb61dc62dcc..a0b56f5a7240f4fcd786ff5a137a68186f62ae8d 100644
--- a/runtime/observatory/lib/src/elements/context_view.html
+++ b/runtime/observatory/lib/src/elements/context_view.html
@@ -47,11 +47,13 @@
           variables ({{ context.variables.length }})
           <curly-block expand="{{ context.variables.length <= 8 }}">
             <div class="memberList">
-              <template repeat="{{ variable in context.variables }}">
+              <template repeat="{{ index in context.variables.asMap().keys }}">
                 <div class="memberItem">
-                  <div class="memberName">[{{ variable['index']}}]</div>
+                  <div class="memberName">[{{ index }}]</div>
                   <div class="memberValue">
-                    <any-service-ref ref="{{ variable['value'] }}"></any-service-ref>
+                    <any-service-ref
+                       ref="{{ context.variables[index]{'value'] }}">
+                    </any-service-ref>
                   </div>
                 </div>
               </template>