[PATCH 0/3] Clean up flow traversal macros