Improve r35695/35696 by repeating the whole function call in each