Track GlobalRef consistently
#107
+98
−76
Merged
GlobalRef consistently
#107