Change return type of fix_closure_name/1