Add support for 2-card and 3-card match modes.