Improved matchup.py.