Moving away from named return param broke recover