Improved custom flow macros.