Converted 8x tests of SimplifyCFG to use FileCheck instead of grep.