Added more control over write barrier. In particular separated scans after a hit.