Added replace_self_with_func_names to Converter and simplified remove_lambda nesting in Converter