Improved simplification of ifs (especially those that result from specia...

lize).