(M-40693): Separate J0-3379, C2-637E and U+938C.