Fix inconsistent type signatures for mapping and xlist. Add some clarifications.