JEXL-372, JEXL-373: fixing multiple vars declaration in loop, grammar change; refacto...