Continue work on closure conversion