do not flatten ifs without elses
fix bug in aggressive variable elimination and re-enable it