(For ...) macro + fixes to macro system