Fixes for clearer dumps of global variables and references.