Fix inconsistent type signatures for mapping and xlist.