Service cleanups...

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

Index: runtime/observatory/lib/src/elements/context_ref.html
diff --git a/runtime/observatory/lib/src/elements/context_ref.html b/runtime/observatory/lib/src/elements/context_ref.html
index deb767b67638fdbf377217575c51a0cc7ad9910d..82e313d5e95789938e589b5a2790d4488cb8a0a1 100644
--- a/runtime/observatory/lib/src/elements/context_ref.html
+++ b/runtime/observatory/lib/src/elements/context_ref.html
@@ -16,11 +16,12 @@
               <any-service-ref ref="{{ ref.parentContext }}"></any-service-ref>
             </div>
           </div>
-          <template repeat="{{ variable in ref.variables }}">
+          <template repeat="{{ index in ref.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="{{ ref.variables[index]['value'] }}">
+                </any-service-ref>
               </div>
             </div>
           </template>