foreach macros improved.