Improving gc:HP and gc::DHP guards