introduce helpers and clean out old combo*matching stuff