Swap out split lambda list, uses triv now