Fixing last issues with VSX's patch modernization.