A bit of cleanup in the Mapper