(GX) Video inlining cleanups