Revert "Improve Hash foreach macros"

This reverts commit 95bb0a0f7aec46cacf6a447ded1688e6c6ff4b62.