Tweaking foreach calls to deal with it no longer being a macro.