Fixed incorrect handling of label of if-then and if-then-else.
Improved label handling during translation