Cleanup: make std::pair usage slightly less indecipherable without actually naming...