Sourcemap matches now interpolate previous saved match parts