Hi all. Added a PR to support mapped args in control flow functions. Would appreciate any thoughts or feedback (especially if there's an alternative option available I've missed entirely).