Simplify code a bit, and fix bug CodeExtractor/2004-03-14-NoSwitchSupport.ll