Add Attachment:STR-119: Replace GCC nested functions by stack-allocated closures as structs