Per your comment, I'm putting the stylistic changes to CFG.cpp in a
separate patch. Please see
I did two things in this patch:
1. "no 'else' after 'return'" -- this is for conformance with the
2. move 'else' to the line of the previous '}' -- this is for consistency.
All tests pass. Thanks,