killed ifs and elses when other constructs were more appropriate