Use ITE, fix insidious bug.