Use new shorten_stl_types in scope tracker