Add small optimisation to allow catching more IF / ELSE cases