Fix enumerate macro (e.g. in case of break/continue)