merge after changes related to funcnames for previously anonymous functions