Small improvement to evaporate, fix multi-line if