Pass SOV_XPG4_2 and MSG_XPG4_2 everywhere