Merge "Revert "Revert "Scan immune spaces using mod union tables."""