bc67a32
- Rewrite patch for BZ 175270, BZ 175083 so as to catch the exception earlier. - Remove too-fragile testcases from patches for CFA value and "S" augmentation.