Remove use of tuple traits