PIM-1640: Reduce metric field width