Get rid of record argument, we now use generics.