integrating new codewalker macro into closure conversion