Reduce clause count threshold for switch creation.

Makes tests easier to write. May change it back later if it proves
suboptimal, but right now we don't know either way.
Fix switchification of top-level ifs.