Remove unnecessary complexity in mapper.