Add production support for numbered submatches