Some more tweaks for bug #8157.  It now is only differential and ignore.