unconditionalise some if true blocks