further cleanup from tpl_for example conversion