useless-if-before-free: improve conversion code