Add test on conditions in multiline statements which now breaks ie for configure
Move condition detection up to have it everywhere