libcommon: Further cleaned up common/src/p_map.cpp