Not sure we should have got rid of this `else` statement